Merge branch 'master' of github.com:SiriDB/siridb-server into dev
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 12 Oct 2018 18:28:19 +0000 (20:28 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 12 Oct 2018 18:28:19 +0000 (20:28 +0200)

Trivial merge